From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 23 Sep 2015 18:40:42 +0000 (+0200)
Subject: main: Fix constness mismatches
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1198
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6c43d0247ac207a345efbc13f985b5a2ffdb36c0;p=gnome-shell.git

main: Fix constness mismatches
---

diff --git a/src/main.c b/src/main.c
index 1dd2538bf..d984eec26 100644
--- a/src/main.c
+++ b/src/main.c
@@ -51,11 +51,11 @@ enum {
 static int _shell_debug;
 
 static void
-shell_dbus_acquire_name (GDBusProxy *bus,
-                         guint32     request_name_flags,
-                         guint32    *request_name_result,
-                         gchar      *name,
-                         gboolean    fatal)
+shell_dbus_acquire_name (GDBusProxy  *bus,
+                         guint32      request_name_flags,
+                         guint32     *request_name_result,
+                         const gchar *name,
+                         gboolean     fatal)
 {
   GError *error = NULL;
   GVariant *request_name_variant;
@@ -77,16 +77,16 @@ shell_dbus_acquire_name (GDBusProxy *bus,
 }
 
 static void
-shell_dbus_acquire_names (GDBusProxy *bus,
-                          guint32     request_name_flags,
-                          gchar      *name,
-                          gboolean    fatal, ...) G_GNUC_NULL_TERMINATED;
+shell_dbus_acquire_names (GDBusProxy  *bus,
+                          guint32      request_name_flags,
+                          const gchar *name,
+                          gboolean     fatal, ...) G_GNUC_NULL_TERMINATED;
 
 static void
-shell_dbus_acquire_names (GDBusProxy *bus,
-                          guint32     request_name_flags,
-                          gchar      *name,
-                          gboolean    fatal, ...)
+shell_dbus_acquire_names (GDBusProxy  *bus,
+                          guint32      request_name_flags,
+                          const gchar *name,
+                          gboolean     fatal, ...)
 {
   va_list al;
   guint32 request_name_result;
@@ -454,7 +454,7 @@ main (int argc, char **argv)
 
   /* Initialize the global object */
   if (session_mode == NULL)
-    session_mode = is_gdm_mode ? "gdm" : "user";
+    session_mode = is_gdm_mode ? (char *)"gdm" : (char *)"user";
 
   _shell_global_init ("session-mode", session_mode, NULL);